libostree: Reformat bootloader titles

Use the pattern:

  $PRETTY_NAME [$COMMIT_VERSION] (ostree[:$OSNAME][:$DEPLOYMENT_INDEX])

$OSNAME is only shown if there are multiple values.

$COMMIT_VERSION refers to the version tag in the commit's metadata.

$DEPLOYMENT_INDEX is only shown if no $COMMIT_VERSION is available.

https://bugzilla.gnome.org/show_bug.cgi?id=739416

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 8d9fe0c7afb57f9f45af9707d0f66aa161dc0b57..1ebae77ec78a54f3366258873e71cc5a68565e88 100644 (file)
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1240,9 +1240,11 @@ parse_os_release (const char *contents,
  */
 static gboolean
 install_deployment_kernel (OstreeSysroot   *sysroot,
+                           OstreeRepo      *repo,
                            int             new_bootversion,
                            OstreeDeployment   *deployment,
                            guint           n_deployments,
+                           gboolean        show_osname,
                            GCancellable   *cancellable,
                            GError        **error)
 
@@ -1262,15 +1264,16 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
   gs_unref_object GFile *etc_os_release = NULL;
   gs_unref_object GFile *deployment_dir = NULL;
   gs_free char *contents = NULL;
+  gs_free char *deployment_version = NULL;
   gs_unref_hashtable GHashTable *osrelease_values = NULL;
   gs_free char *linux_relpath = NULL;
   gs_free char *linux_key = NULL;
   gs_free char *initramfs_relpath = NULL;
-  gs_free char *title_key = NULL;
   gs_free char *initrd_key = NULL;
   gs_free char *version_key = NULL;
   gs_free char *ostree_kernel_arg = NULL;
   gs_free char *options_key = NULL;
+  GString *title_key;
   __attribute__((cleanup(_ostree_kernel_args_cleanup))) OstreeKernelArgs *kargs = NULL;
   const char *val;
   OstreeBootconfigParser *bootconfig;
@@ -1343,10 +1346,44 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
       goto out;
     }
   
-  title_key = g_strdup_printf ("ostree:%s:%d %s", ostree_deployment_get_osname (deployment),
-                               ostree_deployment_get_index (deployment),
-                               val);
-  ostree_bootconfig_parser_set (bootconfig, "title", title_key);
+
+  if (repo)
+    {
+      /* Try extracting a version for this deployment. */
+      const char *csum = ostree_deployment_get_csum (deployment);
+      gs_unref_variant GVariant *variant = NULL;
+      gs_unref_variant GVariant *metadata = NULL;
+
+      /* XXX Copying ot_admin_checksum_version() + bits from
+       *     ot-admin-builtin-status.c.  Maybe this should be
+       *     public API in libostree? */
+      if (ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, csum,
+                                    &variant, NULL))
+        {
+          metadata = g_variant_get_child_value (variant, 0);
+          g_variant_lookup (metadata, "version", "s", &deployment_version);
+        }
+    }
+
+  title_key = g_string_new (val);
+  if (deployment_version && *deployment_version)
+    {
+      g_string_append_c (title_key, ' ');
+      g_string_append (title_key, deployment_version);
+    }
+  g_string_append (title_key, " (ostree");
+  if (show_osname)
+    {
+      g_string_append_c (title_key, ':');
+      g_string_append (title_key, osname);
+    }
+  if (!(deployment_version && *deployment_version))
+    {
+      g_string_append_printf (title_key, ":%d", ostree_deployment_get_index (deployment));
+    }
+  g_string_append_c (title_key, ')');
+  ostree_bootconfig_parser_set (bootconfig, "title", title_key->str);
+  g_string_free (title_key, TRUE);
 
   version_key = g_strdup_printf ("%d", n_deployments - ostree_deployment_get_index (deployment));
   ostree_bootconfig_parser_set (bootconfig, "version", version_key);
@@ -1600,6 +1637,8 @@ ostree_sysroot_write_deployments (OstreeSysroot     *self,
       int new_bootversion = self->bootversion ? 0 : 1;
       gs_unref_object OstreeBootloader *bootloader = NULL;
       gs_unref_object GFile *new_loader_entries_dir = NULL;
+      gs_unref_object OstreeRepo *repo = NULL;
+      gboolean show_osname = FALSE;
 
       if (!_ostree_sysroot_query_bootloader (self, &bootloader, cancellable, error))
         goto out;
@@ -1611,12 +1650,34 @@ ostree_sysroot_write_deployments (OstreeSysroot     *self,
       if (!ot_util_ensure_directory_and_fsync (new_loader_entries_dir, cancellable, error))
         goto out;
       
+      /* Need the repo to try and extract the versions for deployments.
+       * But this is a "nice-to-have" for the bootloader UI, so failure
+       * here is not fatal to the whole operation.  We just gracefully
+       * fall back to the deployment index. */
+      (void) ostree_sysroot_get_repo (self, &repo, cancellable, NULL);
+
+      /* Only show the osname in bootloader titles if there are multiple
+       * osname's among the new deployments.  Check for that here. */
+      for (i = 1; i < new_deployments->len; i++)
+        {
+          const gchar *osname_0, *osname_i;
+
+          osname_0 = ostree_deployment_get_osname (new_deployments->pdata[0]);
+          osname_i = ostree_deployment_get_osname (new_deployments->pdata[i]);
+
+          if (!g_str_equal (osname_0, osname_i))
+            {
+              show_osname = TRUE;
+              break;
+            }
+        }
+
       for (i = 0; i < new_deployments->len; i++)
         {
           OstreeDeployment *deployment = new_deployments->pdata[i];
-          if (!install_deployment_kernel (self, new_bootversion,
+          if (!install_deployment_kernel (self, repo, new_bootversion,
                                           deployment, new_deployments->len,
-                                          cancellable, error))
+                                          show_osname, cancellable, error))
             {
               g_prefix_error (error, "Installing kernel: ");
               goto out;

diff --git a/tests/admin-test.sh b/tests/admin-test.sh
index 94aef64cf5e67ff30eccc9ae80451c73d1a727ff..cc928926256b2d27860fe88a1e07f5f525d882c2 100755 (executable)
--- a/tests/admin-test.sh
+++ b/tests/admin-test.sh
@@ -29,6 +29,7 @@ ostree admin --sysroot=sysroot deploy --karg=root=LABEL=MOO --karg=quiet --os=te
 ostree admin --sysroot=sysroot status | tee status.txt
 
 assert_file_has_content status.txt 'Version: 1.0.10'
+assert_file_has_content sysroot/boot/loader/syslinux.conf 'TestOS 1.0.10'
 
 echo "ok deploy command"